Bug 826354 - Don't show cards view when screen is locked
Merge pull request #7291 from ttaubert/cardsview/bug-826354-dont-show-when-locked

Bug 826354 - Don't show cards view when screen is locked
Auto-merge from branch 'master'