Merge "Add support for updating apns when only resource changed"