Merge "Add ability for ResolverDrawer to be align to top via XML attribute."