Merge "Fix screenshot UI for insets" into rvc-dev am: f39155c305 am: 0b612bee6b am: e7f4b366b9

Change-Id: Ibea3a3e33c04a597449d3554aa5ce90df4575191