[automerger skipped] Merge "DO NOT MERGE use left/right insets instead of...

[automerger skipped] Merge "DO NOT MERGE use left/right insets instead of cutout" into qt-qpr1-dev am: 820aa463 -s ours am: df6a67cc am: 70e2f947

Change-Id: I7d747f922bf1f4df26624f7aacfdb628b4e4736c