Merge "Fix issue # 5017868: Twitter crashes on start:"