Merge "Refactoring push reordering (issue 7139335)" into jb-mr1.1-dev