Merge "Ensure we only remove messages for the same app info" into qt-dev
am: a69375ec2e

Change-Id: I7b0de9f5b74c65fadac202835633a2f53e2b2a3b