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

Change-Id: I07a15e5f4a79418cb7d46751ff14518e3ac1980f