Merge "Remove the constants for calculation window size" into main