Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev