Merge "Don't use SMS database until after the phone is unlocked" into nyc-mr1-dev