Merge "Add config to show assistant above the dream" into rvc-dev am: 4cb9d5d936

Change-Id: I71afb3ccec4b50ae29190fc4c2f1590239cdc807