am 4dd6c535: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

am 4dd6c535: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '4dd6c535cef6e9c05143cb5cf066a4c71c968da9':
  Do not add crop into preset if in inital setup
  Fix conflict with other build fix
  Fix build
  Fix SRI Pano orientation
  Update the assets of unlock and camera icons in filmstrip.
  Fix NPE due to progress bar not existing.
  Fix share crash after closing photo editor
  Set the thumbnail/screennail sizes based on screensize
  New UI...
  Upscale images to fill screen for slideshow
  Snap back photo after swipe in y-direction in filmstrip
  Fix ANR in image editor
  Fix crash, remove logging added to diagnose bug
  More logs for gallery crash error, remove a potential cause
  Fix Monkey NPE
  Grid/filmstrip switching behavior improvements
  Reskin: Fix stability bugs introduced by reskin
  Fix NPE, ANRs in Gallery
  Fix ANRs in Gallery