Configuring state hanging fixed

Change-Id: I171db230ffec410942d8a7ccada86e43d148b442
Fixes: bug #1232084
Merge "Configuring state hanging fixed"