Merge "Add account change receiver to handle account removal"