Make OnePick modal even on top of ours
Merge pull request #2089 from reciprocity/hotfix/CORE-475

Make OnePick modal even on top of ours