Merge "Don't assume a default of 'false' for TwoStatePreference" into jb-mr1-dev