Merge "Fix an issue with editing communal widgets on fingerprint failure." into main