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

Change-Id: I81b6d1356dad7db58b10a76ae049d64590ac8909