Merge "Fix face unlock does not work for top app in split screen" into tm-dev