Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev