Merge "Stop using intent-filter priority as display order"