Merge "Cleaned up the logic for the picture end margin" into nyc-dev