Merge "draw-wakelock: cache flag and version check to avoid perf regression" into main