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

Change-Id: If8866c0106e8fdc2f343da8c82ce8e9fd67ea33e