Merge "Change Format_frameBitShift() API for non-power-of-2 sizes"