Merge "Fix keyboard overlap in work challenge landscape view" into rvc-dev