Merge "Update top bar with new settings intent" into rvc-dev am: abaab46da7

Change-Id: I52b07c7f8e41057cc1d540058fb00e2bf9a6b26a