Merge "Fix NPE on Activity start in TextView"