Merge "Remove old/unused method of enable fp auth while occluded"