Merge "Always use V4 FEATURE_HARDWARE_KEYSTORE XML file" into main