Merge "Add Null check when excluding IME window surface for snapshot"