Merge "Start a new keyguard session on device sleep" into tm-qpr-dev