Merge "Fix disable/force stop app button incorrect state." into oc-dev
am: 6190c159e8

Change-Id: I3aff38236f1eeb69779a53a1b971f83f69bc752d