- changing video surfaces while call is active
https://github.com/openpeer/opandroid/issues/483
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140730-is-composing

Conflicts:
	libs/op