VID-1268

Merge #2692 first.

See https://github.com/Wikia/app/pull/2733 for Liz's comments and a diff without VID-1156 in it.