Merge "Fixed BiDi layout issue in screen "Add FDN""