Merge changes from topic "settings-change" into udc-qpr-dev

* changes:
  Inject system settings, secure settings & system clock to make it easily testable
  Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used