Merge "Fix user photo popup layout for RTL" into nyc-dev