Merge "Fix not showing system bars in split screen" into tm-dev