Merge changes I000811e5,Idab6285b into udc-dev

* changes:
  [Central Surfaces] Migrate TapAgainView(&Controller) to singleton.
  [Central Surfaces] Make LockIconView(&Controller) a singleton.