Merge "Delay settings panel visibility until touch slop exceeded."