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

* commit 'dc5130aab2a30a72474cf54d40b0861dd8da0661':
  fix list view wide layout when photos disabled