Merge "Fix issue #11050678: Large memory leak in ActivityStack" into klp-dev