Merge "Fix "Emergency Information" text overflow" into oc-dr1-dev