Merge "Marking the Settings ContentProvider as singleUser" into lmp-dev