am bd633b72: am 167e7488: Merge "3404665 Preview window is blank after returning from playing exported movie" into honeycomb

* commit 'bd633b7297c60771223f0e8799c418cdbce3017c':
  3404665 Preview window is blank after returning from playing exported movie