Merge "Make sure that updated wallpaper id is immediate" into oc-mr1-dev am: 955bfb6e25
am: a645aac5a7

Change-Id: If3cf6546dad093673b6e6fc234613c33d385fd19