Merge "fs_mgr: overlay: do not allow sub-mounts to be overridden" into qt-r1-dev