Merge "Do not restore auto-rotation setting when target device is a tablet" into tm-qpr-dev