Merge "Not treating "Screen is empty" as an anomaly in NavigationModeSwitchRule" into ub-launcher3-master