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

Change-Id: I152d83f2442a518560b6e82231035ae10b476834