Merge "Force single stack id workaround. (Bug 19560619)"