Merge "Handle the new app source certificate"