Merge changes Ifd2de38a,I57633d60

* changes:
  Divider tuning
  Fix unneccesary activity relaunches