Merge "fs_mgr_remount: fix a typo" into qt-dev