Merge "Stop face auth if occluding app doesn't want face auth." into tm-qpr-dev