Merge "Increase lock screen timeout when on custom widget page." into jb-mr1-dev