Early return when state has not changed

Test: manual
Fixes: 145463139
Change-Id: I9a9116165f9d50215ae8882275d715e7ad9a19b2
2 files changed