Merge "FP2-1770: Revert DPI changes for CTS compliance" into fp2-dev-v2