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
tree: 0445e3b82b43c8f2b5aa30d004a358ddecd58fac
  1. res/
  2. src/