Merge "Fix the finding logic of MediaButtonSession" into oc-dev