Merge "Guard against NullPointerException when getActivity in PanelFragment" into sc-dev