Merge "Add @hide support for styleable attributes"