Merge "Revert "Remove zoom from wake-up transition"" into sc-dev