Fix critical bug
Color change
Merge remote-tracking branch 'origin/master'

Conflicts:
	checkpoint_6/src/main/java/com/android/example/leanback/fastlane/CardPresenter.java
Color change