Merge "Prevent crash when display is already removed by the time we get displayAdded" into ub-launcher3-master