Add user preference for non-beta disabling

Change-Id: I3f581975cfdf33bc15b8a4b23549c6401b4bfb87