Only show recommended tab for opt-in users (bug 1097332)

Updated to wait on both promises. Let me know if I got that right.