Merge "Make inner classes of ConcurrentMessageQueue static and/or final where able" into main