Merge "Fixed Bidi layout issue of MyInfo in Settings"