make card visible on Lollipop
Merge remote-tracking branch 'upstream/master'