Merge changes Ica07166f,I8138d42d

* changes:
  Eliminate Null checks for local color pages
  Update wallpaper window pages only at processing