Merge "Rename PREFERENCE_PRIORITY_* to PREFERENCE_ORDER_*"