Merge "Add callback for when enrollment state changes" into sc-qpr1-dev