Merge "Properly remove edge panels"