Merge "Monitor device rotation" into jb-mr2-dev