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

Change-Id: Ic0a7b138fcee84d4e1c830085e9fba9116bfa056