Merge "Fix focus notification" into gingerbread