Merge "Merge "Fix dropped rotation events when unlocking orientation" into qt-dev am: a129679d am: a9820571" into qt-r1-dev-plus-aosp