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

* commit '0513125c92789912214235faad26e7a97184a53a':
  Add a check to adjust thumbnail scaling for full screen shots on TV

Change-Id: I617796ca2d7476801517587cf81f29f8edc93d2d