Merge "Don't hide "Switch on work" button in landscape" into rvc-dev