Merge "Fix video don't play when send intent in keyguardlock mode"