Merge changes I1a33f6a3,Ib46900ff into mm6.0

* changes:
  Fix for issue where the ModButtonUI was not properly updating after taking a note.
  Automatic translation import
tree: 746461578e634a516a8ac7c5674fd2312ef56d1e
  1. res/
  2. src/
  3. tests/
  4. .gitreview
  5. proguard.flags