Merge "Using content provider to update launcher settings" into ub-launcher3-burnaby