Merge "Fix conflict on rename setLastFocusedTaskDisplayArea"