Merge "Merge "Ensure margins for floating rotation button account for corner insets" into qt-dev am: 64fc46315f am: cdc61755a2" into qt-r1-dev-plus-aosp