Small improvements for when you want modals on modals

 - Fix backdrop removal bug when backdrop is off
 - Add keepOpen option to popup options