Second call 871127

This pull request also includes the commit for bug 908186 (attention_screen.js). That makes it easier to test but don't review it :)