Merge "Revert "Revert "Update theme for ChannelPanelActivity""" into udc-dev