Merge "Fix text direction" into rvc-dev am: 09aa3bc4b7 am: 3c506f462e

Change-Id: I75ab4e43ca8bfce2c811f4018a271da1a5eebb45