Merge "Add null check to RecentTasks.java" into pi-dev