Merge "Custom layout for support info dialog"