Bug 920357 - cancel edit mode by clicking not-icon area
Merge pull request #12412 from cctuan/920357

Bug 920357 - cancel edit mode by clicking non-icon area