Merge "Fix failing TextActivityTest."