Merge "Fix blinking animation during Visibility transitions."