Merge "Move dev option restriction check from app to controller."