Merge "Update the use of registerAppInfo" into sc-dev