Merge "Take screenshot of finishing apps as requested" into nyc-dev