Merge "Revert "setShowWhenLocked/inherit in a Transition"" into main