Merge proposals dependent on lp://staging/~gary-wzl77/nearby-scope/generate_fat_click_package

1. generate_fat_click_package
2. Dependent merge proposals