Merge "Improved interception logic of the PanelView"