Merge "Fix bug with CLEAR_TASK -- wouldn't clear the top activity." into ics-mr0