Merge "Merge AppWindowToken into ActivityRecord"