Merge "Smooth transitions between SHOW_WHEN_LOCKED activities"