Merge "LightsOut has its own controller"