Merge "Reseting scrollposition to 0 when going to keyguard" into mnc-dev