Merge "UnifiedEmail: start EmlViewerAcitivty will force close"