Merge "Layout change in support card and support dialog"