Make sure expandingFinished gets called when going into QS

Bug: 22351040
Bug: 22306637
Change-Id: I8d1f9fb400b328753bd8444bf3b4a744ad23a53a
2 files changed