Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev