Merge "Fix rendering of digitalClock/Gallery in Eclipse editors." into gingerbread