Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev