Merge "Fixes failing CTS tests for custom description in save dialog. Screenshots showing no changes from before: http://shortn/_n52tNerWx6" into udc-qpr-dev