Merge "fix list view wide layout when photos disabled" into jb-mr2-dev