Few changes for icehouse ui sanity

These changes are required to run ui sanity on icehouse release as icehouse horizon's look has changed

Change-Id: Ic965abd7738e0b1b658c7ef78dd3aba90c857903
Merge "Few changes for icehouse ui sanity"