Merge "Adjust branding image layout if needed." into tm-dev