Merge "Fix camera display orientation."