Merge "Set config_matchSecondaryInternalDisplay.. default to false" into main