Merge "PhoneWindowManager: Delay setting updates during window animation." into cm-10.2