Merge "Finish MediaProj..Perm..Activity if Keyguard is dismissed" into main