Merge "43409: NPE when trying to rename the application package identifier"