Merge "Fix bug 5226097 - App compatibility issues around new ListView fixes"