Merge "Merge "Fix handles redrawing when not visible" into qt-r1-dev am: d302e316 am: 84a986bc" into qt-qpr1-dev-plus-aosp