Merge "Add flag for face message defer logic update" into main