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

Change-Id: Ice2c9f2d93d5ffecb569eace2d2e0caa4ecb6c88