Merge "Setting a wallpaper must be synchronous" into oc-mr1-dev
am: b00a8aa688

Change-Id: I71cc12349dd80bbb8b0a6776c3e8846baa3dd501