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