Merge "Don't show face messages if fp messages are showing" into main