am f2fc1cbb: Merge "Fix stack traversal order when removing or adding media button receiver"

* commit 'f2fc1cbb067eb12eccb23c5469814675539e28a6':
  Fix stack traversal order when removing or adding media button receiver