Merge "Fix onMetadataChanged listener failure"