Merge "Add filtering of preferences in developer options" into ub-launcher3-master