Merge "Camera: Enable override to portrait by default" into tm-qpr-dev