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

Change-Id: Ibfe8cdef80d78bc6ac7b915e55c16b25d978ce8e