Merge "Add lock task check when entering split screen"