Merge branch 'unstable' into image-links-refactoring

* unstable:
  yellow -> white
  set zoom level after first click on follow
reorder code (also make MediaFilesController less “mutable”)
optimise, add some comments
Merge branch 'image-links-refactoring' into unstable

* image-links-refactoring:
  optimise, add some comments
  reorder code (also make MediaFilesController less “mutable”)
fix compile errors after merge