Merge "move activities for media to media package" into jb-dev