Merge "Handle application info change for system context" into main