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

Change-Id: Idec10c8c0aadccabcd639b5a02e426dc677b9f14