Merge "Stop face auth when bouncerWillBeShown instead of bouncerFullyShown" into tm-qpr-dev