Merge "Make caption a insets source" into rvc-dev am: ac30aafd29 am: 0263c7b06a am: 4be633c5cb

Change-Id: I928a80366514573e76d4d32f70f38e3c41323cff