Merge "A new setting key to hold targets of the a11y button" into rvc-dev am: dba485be4c

Change-Id: I73fcdcf5d76e1cb521c896d0815feea17a90b8cb