Merge "Avoid unexpected screen off during perf testing" into rvc-dev