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: I259921a194561d097c1a0cb932fbc552453a0b36
Merge "Few changes for icehouse ui sanity" into R1.10