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

Change-Id: Ic39cdb20a5fcdcc70004a9079b808b5513423ce5