PB-752 #comment crash fix after device restart + test fixes.