Merge "Fix shortcup broken issue."
tree: 1770cf70e6ffd4218e3acf707d46daefe1b85713
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/