Restore DeskClock's dock behavior.

(partial revert of change Ie9494136, functionality roughly
on-par with ics-mr1 now, plus bugfixes)

Change-Id: I65a5911e54266dff9b52c734e6dc782edcdec364
2 files changed