Merge "Stop screensaver on incoming phone call." into jb-mr1-dev