Merge "Fix a problem in finish affinity in Activity Manager." into jb-dev