Merge "Merge "Hide and re-show assist handles when phone is rotated." into qt-dev am: fa6082f2 am: fe5f751b" into qt-r1-dev-plus-aosp