Merge "board: 8960-pmic: Swap mapping of camera snapshot and focus keys"