Merge "Do not unminimize after rotate when minimized getting wrong transition" into oc-dev am: 97960fbf84
am: f61883caa8

Change-Id: I5a39bc6661ea9ec378d904b6002471e4d4a0866d