Merge "Stop face auth requests when users are typing" into qt-qpr1-dev
am: 5364c5c49e

Change-Id: Idfbf507b6c24d517a9e315e63ca61e2fbe3743b7