am 3349078e: Merge "Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps" into jb-dev

* commit '3349078ecd14bb462756c5c1a3a3b594d5b97cb9':
  Fix 6046544: Deleting a photo takes multiple steps and the flow is inconsistent with other deleting flows on other core apps
tree: 192aff1d1b13f4bfe2c2acabc917b633ef402fd8
  1. res/
  2. src/