Merge "Show the "Face unlock unavailable" message on bouncer as well" into tm-qpr-dev