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

* commit '1baf17d5be43f673beda529f705ae10c7e945563':
  Reseting scrollposition to 0 when going to keyguard