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

Change-Id: I7ec063ff6716a41d6b1ab6b5373db610e19201d6