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

Change-Id: I9015cd7e204bf0c4bbd670591312abbffb300745