Merge "Revert "C2SoftHevcEnc: Increase supported resolution to 960x544""