Merge "Various inset fixes" into rvc-dev am: 96cc10c2de

Change-Id: Iacb85d97cb6d1f821006acff37cddeba34b6c851