Merge "Adding reorder hinting, hopefully will help with (issue 10654628)" into jb-ub-now-kermit