Merge "Turn off TWOLINE_TEXT_ALLAPPS" into udc-qpr-dev