Merge "Fixes cursor status when editing with popup or grab handle." into devel/master