Merge "Fix freeze wrong display when finishing activity"