Merge "Don't let touches go through popup when notification is present" into ub-launcher3-master