Merge "RESTRICT AUTOMERGE: Camera: Hide keys for the rotate-and-crop controls" into rvc-dev am: 0b3db44d am: 934e2470 Change-Id: Ida9925b055fdbb1a7ec9c7c4c66b332512dac3fc