Merge "Add a way to disable auto rotation for immersive apps" into tm-qpr-dev