Merge "Wording change for Daydream setting" into jb-mr1-dev