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

Change-Id: I533e36cee40c79f73ec714a248f39ec35e9c6a8d