Merge "Update AE flicker test bug component" into main