Merge "Camera: Enable the rotate&crop heuristics in the legacy shim layer" into tm-dev