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

Change-Id: I91fe62801d9476f22650d984694b73c00f361bc0