Unmount cluster page subviews properly

Change-Id: I7771fa9eb72f84dc1e86779a3d2bb9169de1eaee
Merge "Unmount cluster page subviews properly"