Merge "Fix 3356338: Add recovery text to AccountUnlockScreen" into honeycomb