Merge "fix tab out animation bug" into ics-mr0