Merge "Make sure the full screen playing continue when timeout" into honeycomb-mr1