Merge "Ignore layout bound markers during patch calculation"