Fixing a possible flickering of notification when switching between activities
Merge branch 'master' of https://github.com/googlecast/CastCompanionLibrary-android

Conflicts:
	src/com/google/sample/castcompanionlibrary/cast/VideoCastManager.java
Code revision