Merge changes I0efc513b,Ibe45ba62 into nyc-dev

* changes:
  Adding more logging of the state to the bug report.
  Disable landscape aspect-scaled behavior for TV.