Merge "Make 'Edit' behave more consistent with 'Crop'. DO NOT MERGE." into jb-dev
tree: 1b893ac0776144adb86a84673199ba3ebad5a0fa
  1. res/
  2. src/