Merge "Code completion in custom views now picks up newly added attrs"