Merge "Change subtitle of favoriting screen" into udc-dev