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

Change-Id: I5749fef5c889b9bff87240be5e76f16bba6fd31a