Merge "NPE from bMessage MIME parsing crashes BT" into rvc-dev