Merge "camera2-portability: Touch-to-focus accounting for effective crop" into lmp-dev