am 83a5d38c: Add configuration button to live wallpaper picker.

Merge commit '83a5d38cb6fd7f9f890afb5281937991c71ebd1c'

* commit '83a5d38cb6fd7f9f890afb5281937991c71ebd1c':
  Add configuration button to live wallpaper picker.