Merge "Fix RTL for blocked number layout" into nyc-dev