Merge "Update top bar with new settings intent" into rvc-dev am: abaab46da7 am: 66df0db383 am: 1e41574857 am: ab03e385ad

Change-Id: I801779dd7f9e7a8f0a6598d7b098ff3ce3e2bfc3