Merge "Camera: New test to check app firing intent after capturing picture/video" into jb-mr1-dev