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