[581758] Handle removal of ResourceNavigator and friends

Change-Id: I6b26e1d1e50d732c1cbbcf963b3f2ec94d6e5db7
8 files changed