Merge "Fix issue where we weren't dismissing the pip menu activity." into oc-dev