Merge changes I966312e0,Ie443f626 into tm-qpr-dev

* changes:
  Properly store CustomTile added/removed
  Add a FakeSharedPreferences for testing