Merge "Fix issues in Opengl Benchmark tests:  - fix live wallpaper drawing, bind the global vertex program after it  - scale the icons according to render surface in display icons, also    add a background for the icon display test case."