Merge "Dim the screen quickly in response to user activity timeout." into jb-mr1-dev