am bf8f4b8c: am 1baf17d5: am 059271ec: Merge "Reseting scrollposition to 0 when going to keyguard" into mnc-dev

* commit 'bf8f4b8c6091a8b035d41fb34bedcdfc3c12ec7a':
  Reseting scrollposition to 0 when going to keyguard