Merge "Image Preview UI: adjust the +N item and loading idicator layouts" into udc-qpr-dev