Merge "Fixed button bar alignment issue in RTL languages"