Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb