Merge changes If1b263df,I95afbcf0

* changes:
  Move instantiation-through-reflection method to controller
  Minor cleanup in DashboardFragment: remove unused code