Merge "Add support for setting camera display orientation."