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

Change-Id: I8403d942429a06a27e79808c30e2e8813bf198e9