Merge \"Fixed bug with continuously changing orientation while dreaming\" into nyc-mr1-dev
am: 8a009f43bf

Change-Id: I968eafcd1066d711e23e29506a841d8d61eb6404