am 88c66cbb: Merge "Dream when user activity times out while docked if...
am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev
* commit '88c66cbb':
Dream when user activity times out while docked if appropriate.