OmniControl: move OmniStore into top-level grid

Change-Id: I51b604af6abc087d94de754dbc55fbce4d9acab6
7 files changed