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