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

Change-Id: I57ef146d92edb68ec17110678f81ea0f5f3a4ffa