Merge "[DO NOT MERGE] Wait for preloading images to complete before inflating notifications" into udc-dev