Merge "Update application info for activity record when application info changed" into main