Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev