Merge "Fix NAS feedback UI debug info" into sc-dev