Merge "Make caption a insets source" into rvc-dev am: ac30aafd29

Change-Id: Iba68581a33dc6522af4e1ccb833b07f787167092