Merge "Null check intent before starting "learn more"." into nyc-dev