Fixing issue with RTL display of badge and pokey

Change-Id: I49ab97ef062fd9a58da80ff0f5fbd21a72770855