am 51cd50d7: Merge "Using content provider to update launcher settings" into ub-launcher3-burnaby

* commit '51cd50d7f1649f4bdea42483503810735555868e':
  Using content provider to update launcher settings