Cleanup
Fixed bug where modal view height got increased when dragging.
The top margin (modal view's distance to top of screen) was added to view height.
Fixed bug: modal view didn't leave screen before removed.
Had missed to add top margin (modal view's distance from top of screen) to Y value of modal's frame.
Bug fixes

h 'develop'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.