Merge "Removed unused and broken screen_progress" into gingerbread