Merge "Add config to show assistant above the dream" into rvc-dev am: 4cb9d5d9 am: cde6a851 am: c29807b0 am: 52164a91 Change-Id: Ibd6cdaad9c216b3fb01e800bbe4f0e0df0fe395a