Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev