merge b2g-18 camera patch