Merge "Add oobe dream settings activity"