Merge "Modify nanoapp message checking logic" into sc-dev