Merge "Make WindowOrganizer and TaskOrganizer non-static"