Merge "Dream Settings: Disable settings icon if not selected." into jb-mr1-dev