Merge "Add secure version of image capture intent." into jb-mr1-dev