Some fixes, hopefully will fix issue with Search bar not appearing.

Change-Id: I22cb913255f0177e32680b6783f84563726e20ba