Merge "Add timeout to AccountManager#hasFeatures check in DPMS." into main