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

Change-Id: I8ff4369b3476dce0339d1bff1c412c817875b059