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

Change-Id: I1fd104c66ee7a0be7d37edba033b7dffb44a3364