Merge "Revert "Delete PanelViewController"" into tm-qpr-dev