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

Change-Id: Ie6ef27e0d233debca4884c5628c076121c8a5b34