Merge "Don't make Settings' content providers no release." into pi-dev