Merge "Use Settings.System.getIntForUser instead of getInt to make sure user specific settings are used" into udc-dev