Merge "Reverting is_primary sort order back to previous priority." into jb-mr2-dev