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

Change-Id: I2e087cff473bf8a9bdeb28b17dc6b04f8455cedd