Merge "Prevent showing voice session when it is already queued to be hidden." into oc-dev
am: c672cb5ed9

Change-Id: I983396208aa1364884f6b90939c04ef58c2f432c