Merge "Bouncer should dismiss if being tracked when face unlocked" into tm-d1-dev