Merge "Move rotation flags to SF" into udc-qpr-dev