Merge "Fix locked second screen on boot" into rvc-dev