Merge "Update bluetooth preference to take user to new screen" into pi-dev