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

* commit '900e0ba5163bd03becf49922dfdfad07460716f0':
  Dim the screen quickly in response to user activity timeout.