Merge "FPII-1916: TDI display adjust frequency(change to 6K)" into fp/fp2_5.1_int