Merge "More fixes to ensure that touches outside the panel close it." into honeycomb