Merge "Fix two flicker tests assumptions re: usesTaskbar vs. isTablet" into main