[PATCH 02/13] Account for active mounts in normal mode. (#914898)