Merge "Respect partition precedence while deciding overlay priority"