Merge "Do not use last app rotation as default." into jb-mr1-dev