Merge "Merge "Reposition the stack to a similar position upon rotation." into qt-dev am: eaf1f8fd" into qt-dev-plus-aosp