Change-Id: Id82fc76d00a188556460d1a78388d46be56c9c4e
Change-Id: I574d823fedf4b752c3df5a72599b390f708823ac
Also rename CellLayoutChildren to ShortcutsAndWidgetsView Change-Id: Ic2ebc5497adb153cc2fce99730cc2c6fbdc101e6