CB-5916: Add preference for Android persistent location