Merge "Revert ag/18910390. No longer needed with per display getCachedTaskInfo" into main