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

Change-Id: Ib742d2508f86962f616f01b9e44d504b522705fc