Merge changes If90955f4,I9fa48c06,Ib4681a43 into nyc-dev am: 34f5c494

am: be0537a4

* commit 'be0537a4':
  Adding view debug annotations to simplifying debugging state.
  Disallow launching third party apps in safe mode.
  Drawing thumbnail background color for empty space in view.