Merge "Lock launcher rotation during activity transition to allow proper seamless transition at the end" into ub-launcher3-qt-dev am: 1d847cf266
am: 475c20950e

Change-Id: I910acc71a32701da8b2945166332ffc998f15235