Merge "Minor optimizations to task loading/screenshot"