Also move (native) avatar style to film-strip styles, since that's where it applies. This is analogous to how the large-view avatar is styled.
This reverts commit 739298c782.