am b8fc9e7d: Merge "Launcher changes to handle UTS test mode." into eclair

Merge commit 'b8fc9e7df69db4b1647ef780f5620836c86f70ea' into eclair-plus-aosp

* commit 'b8fc9e7df69db4b1647ef780f5620836c86f70ea':
  Launcher changes to handle UTS test mode.