Merge "Keep keyguard from starting after finished call when screen is on"