set zoom level after first click on follow
Merge branch 'DA-361' into unstable

* DA-361:
  set zoom level after first click on follow
yellow -> white
Merge branch 'DA-375' into unstable

* DA-375:
  yellow -> white