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