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

Change-Id: Ia7b4cbf0d318e6e8f792c984d5869f31f9bcb29e