Merge "Revert "[2/n] Let picker refresh preview when user selects a dif..."" into udc-qpr-dev