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

Change-Id: Iab56364bc1067810d98bf6f2f7507b96f164069b