Merge "Fix the dock-insertion Dream entry codepath." into jb-mr1-dev