Merge "Using a common class for observing secure settings" into ub-launcher3-master