Merge "Handle onNewIntent for audio/video activities"