Merge "Don't check if forward locked apps are used by others" into nyc-dev