Merge "Add suppress-this to Lint View, and preserve tree expansion state"