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

Change-Id: I3833c051bc5a527e4379d4e0a4fcbb9b0ef85cc8