Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev