Merge "Remove behind screenOrientation from camera activities." into jb-dev