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

Change-Id: I3e6d64b374e8b5c9df7f2403d3a8eae909e1f425