Merge "Don't show the embedded activities if visible needed activity without showWhenLocked" into sc-v2-dev