Merge "Update dream settings logic to keep the customize button unselected." into tm-dev