Merge "Always set the customize button in dream settings to not selected." into tm-dev