Improve reordering by always using the "push mechanic" if possible (issue 6275309)

Change-Id: I51450c1b1f6b439c87194a6084d82fb9989154a7
1 file changed