Merge "Merge "Hide and re-show assist handles when phone is rotated." into qt-dev am: fa6082f2 am: e424ff5c am: 23e7acda"