Merge "Fix visual glitch in app transition."