Merge "Fix calculation of RelativeLayout width in RTL mode"