Merge "Fix contentInvalidateAll NPE"