Merge "Lock top task if whitelisting arrives after start." into mnc-dev