Merge "Updating freeform app header to match latest spec" into main