Merge "Set flicker logger to Android logger when using WindowManagerStateHelper" into main