Merge "Add timestamp and read status extras to MAP Client message broadcasts"