Merge "refactored screenshot code" into gingerbread