Merge "Always assume layout params changed if app targets <= M"