Merge branch 'develop' into bugfix-uimenucontroller
Restore UIMenuController items after it is dismissed.
Merge branch 'bugfix-uimenucontroller' into develop