Merge "Test for Settings Intents" into gingerbread