Merge omapdss scaling fixes