Merge "Update flicker tests using nav bar / task bar conditions" into main