Merge "Don't load profile widgets until parent is unlocked." into nyc-dev