am e9c8a53c: am 7d7b83bc: Merge "Fix problem where part of wrong photo shows" into jb-mr1.1-dev

* commit 'e9c8a53c11e7092344f49e965150037ca8581dbe':
  Fix problem where part of wrong photo shows