Merge "Changed how Face Unlock coordinates are specified"