Merge "Persistent connection to SMS app 2/2 (main)"