Merge "Remove ZenModeController from NSSL Constructor"