Merge "Remove hack that was added in place of FaceManager fix" into udc-qpr-dev