Merge "show the dream enable switch in all conditions." into jb-mr1-dev