Merge "option to enable multisampling" into gingerbread