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

Change-Id: Ie6f03fa02b3bdfa8349c8dfcb29e8f7dadb5326a