Merge changes Ibd1291ff,I5224900b

* changes:
  Add ability to show/hide System Update.
  Clean up SystemUpdatePreferences tests.