Merge "Allow screen rotation animation when entering AOD" into sc-dev