Merge "Add a check to adjust thumbnail scaling for full screen shots on TV"...
Merge "Add a check to adjust thumbnail scaling for full screen shots on TV" into nyc-dev am: 0513125c
am: 7f265404
* commit '7f265404':
Add a check to adjust thumbnail scaling for full screen shots on TV
Change-Id: I3aba988e5e61c51d67180aad0d7eb1f41b78c245