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

Change-Id: Ia87cf7ecb7ae2fe0d26397598959529dbcd6d51d