Merge "Move restriction check for dev settings into controller"