Merge "Fixed an issue where the insets of the cutout weren't respected" into qt-dev
am: f8668fe661

Change-Id: I08836dd31a19721d37dc80fe4ccff6d3c748381f