Merge "Add an explicitly v4 manifest fragment" into main