When reloading dynamic grid, reload restore page first.

Change-Id: I05c1d1faf61ecd79abf15d4ab84a689b7e0cb2ac
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0