Merge "Removing dependency on XmlResourceParser in default layout parsing" into ub-launcher3-master