Merge "RRO: Fix black screen flashes for splits" into pi-dev