Delay reloading Dynamic grid after size change till onResume or settings panel collapses

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