Merge "Fixing preference highlight when opening notification access" into ub-launcher3-edmonton