Mobile 481 Add support for Camera API style fixes