Merge "New constant used by dev settings" into jb-dev