Fix Omniswitch for recents

Change-Id: I40eb67bcb68b24f9c1cb8805f882d91859dbe7aa