Merge "Using applicationId instead of packageName for xml substitution for increased compatibility" into main