Merge "fs_mgr_remount.cpp: pedantic grammar fixes." into main