Merge pull request #121014 from NoNormalDev/scroll_master