Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev