Merge "Enable forced focus for resumed split screen activities" into tm-qpr-dev