Merge "Ensure showWhenLocked works correctly on back-gesture animation"