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