Merge "Add config to show assistant above the dream" into rvc-dev am: 4cb9d5d9 am: 92a690cc am: 195b705a am: db3992bd Change-Id: I8564b85a11ea3245b898d8f145d5cf66e955eff9