[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: 69885dfc

Change-Id: I7ea286c457bf74bbefe1ff758751271c4be66be9