Merge "Moves appID registration outside of scan commit"