Merge "Avoid ignoring turning on screen requested by slow activity" into rvc-dev