Merged in missing viewscreen fix