Merge commits from main repo

This includes the following commits:

- [OnLook] If in cameria-only, don't show the user's attachments.
- [OnLook] Rebranding Part 4 - The missing icon