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

Change-Id: I38b00abe92611b8a87b2355f7e104f84a384172e