Merge "Bettern handle NPE in RcsTestApp ChatActivity"