Merge "fs_mgr_priv: Extend fs wait timeout to 20 seconds"