Merge branch 'messages_sharedpref'