Merge "Allow phone to go to sleep while in call." into jb-mr1-dev