Merge "Fix layers lifecycle issues"