Merge "Continue to transact pending Mms once after boot completed"