am d50d41e4: (-s ours) DO NOT MERGE: Don\'t freak out if SystemUiService isn\'t available

* commit 'd50d41e4df482a61f840ff912aacea0e00848f41':
  DO NOT MERGE: Don't freak out if SystemUiService isn't available