Merge "Fixed bug with continuously changing orientation while dreaming" into nyc-mr1-dev