Merge "Modify flag behaviour to apply edge resizing to both stylus & cursor." into main