Merge "camera2: Fix null check in PictureCallback." into lmp-dev