Merge "Remove activity leak." into arc-apps