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

Change-Id: I58bd80c310665475fdd94c11e218fd4991fdaa99