Merge changes from topic "face-bypass-move" into qt-r1-dev

* changes:
  Make bypass controller consistent with rest of face unlock settings
  Move lockscreen bypass setting to Settings > Security > Face unlock